update test parentheses

diff --git a/itest/test_parentheses.py b/itest/test_parentheses.py
index 080726d06449c90555930e36a00f09282afa164c..f1eed8257420b4648c52aec35d2fa05ab28df5d2 100644 (file)
--- a/itest/test_parentheses.py
+++ b/itest/test_parentheses.py
@@ -55,21 +55,21 @@ DATA = {
         [1471254705000000008, -9],
         [1471254705000000010, -8]],
     'windows-001': [
-        [1471254705000000005, 7.3],
-        [1471254705000000007, -6.4],
-        [1471254705000000010, -9.8]],
+        [1471254705000000005, 9.3],
+        [1471254705000000007, -3.3],
+        [1471254705000000010, -1.6]],
     'windows-002': [
-        [1471254705000000005, 2],
-        [1471254705000000008, -7],
-        [1471254705000000010, -9]],
+        [1471254705000000005, 4],
+        [1471254705000000008, -8],
+        [1471254705000000010, -2]],
     'windows-003': [
-        [1471254705000000005, 2.9],
-        [1471254705000000007, -5.7],
-        [1471254705000000010, -0.3]],
+        [1471254705000000005, 4.3],
+        [1471254705000000007, -7.9],
+        [1471254705000000010, -1.2]],
     'windows-004': [
-        [1471254705000000005, 3],
-        [1471254705000000008, -9],
-        [1471254705000000010, -8]],
+        [1471254705000000005, 2],
+        [1471254705000000008, -5],
+        [1471254705000000010, -7]],
 
 }
 
@@ -107,7 +107,10 @@ class TestParenth(TestBase):
                     ['linux-004']]})
 
         self.assertEqual(
-            await self.client0.query('list series all - ("series-001" | "series-002" | (/windows.*/ & /.*001/))'),
+            await self.client0.query('''
+                list series all - (
+                    "series-001" | "series-002" | (/windows.*/ & /.*001/))
+                '''),
             {
                 'columns': ['name'],
                 'series': [
@@ -122,7 +125,26 @@ class TestParenth(TestBase):
                     ['windows-004']]})
 
         self.assertEqual(
-            await self.client0.query('list series ("series-001" | "series-002" | /windows.*/) - /.*003/'),
+            await self.client0.query('''
+                list series all - (
+                    "series-001" | "series-002" | (/windows.*/ - /.*001/))
+                '''),
+            {
+                'columns': ['name'],
+                'series': [
+                    ['series-003'],
+                    ['series-004'],
+                    ['linux-001'],
+                    ['linux-002'],
+                    ['linux-003'],
+                    ['linux-004'],
+                    ['windows-001']]})
+
+        self.assertEqual(
+            await self.client0.query('''
+                list series (
+                    "series-001" | "series-002" | /windows.*/) - /.*003/
+                '''),
             {
                 'columns': ['name'],
                 'series': [
@@ -133,14 +155,32 @@ class TestParenth(TestBase):
                     ['windows-004']]})
 
         self.assertEqual(
-            await self.client0.query('list series (/.*001/ & /linux.*/) - /.*001/'),
+            await self.client0.query('''
+                list series all - (/series.*/ ^ /.*001/)
+                '''),
+            {
+                'columns': ['name'],
+                'series': [
+                    ['series-001'],
+                    ['linux-002'],
+                    ['linux-003'],
+                    ['linux-004'],
+                    ['windows-002'],
+                    ['windows-003'],
+                    ['windows-004']]})
+
+        self.assertEqual(
+            await self.client0.query('''
+                list series (/.*001/ & /linux.*/) - /.*001/
+                '''),
             {
                 'columns': ['name'],
                 'series': []})
 
         self.assertEqual(
-            await self.client0.query(
-                'list series /.*001/ & (/series.*/ | /linux.*/)'),
+            await self.client0.query('''
+                list series /.*001/ & (/series.*/ | /linux.*/)
+                '''),
             {
                 'columns': ['name'],
                 'series': [
@@ -148,28 +188,31 @@ class TestParenth(TestBase):
                     ['linux-001']]})
 
         self.assertEqual(
-            await self.client0.query(
-                'list series (/.*001/ | /.*002/) & (/series.*/ | /linux.*/)'),
+            await self.client0.query('''
+                list series /.*001/ & ((((/series.*/ | /linux.*/))))
+                '''),
             {
                 'columns': ['name'],
                 'series': [
                     ['series-001'],
-                    ['series-002'],
-                    ['linux-001'],
-                    ['linux-002']]})
+                    ['linux-001']]})
 
         self.assertEqual(
-            await self.client0.query(
-                'list series /.*001/ & ((/series.*/ | /linux.*/))'),
+            await self.client0.query('''
+                list series (/.*001/ | /.*002/) & (/series.*/ | /linux.*/)
+                '''),
             {
                 'columns': ['name'],
                 'series': [
                     ['series-001'],
-                    ['linux-001']]})
+                    ['series-002'],
+                    ['linux-001'],
+                    ['linux-002']]})
 
         self.assertEqual(
-            await self.client0.query(
-                'list series ((/.*001/ | /.*002/) & (/series.*/ | /linux.*/))'),
+            await self.client0.query('''
+                list series ((/.*001/ | /.*002/) & (/series.*/ | /linux.*/))
+                '''),
             {
                 'columns': ['name'],
                 'series': [
@@ -180,15 +223,17 @@ class TestParenth(TestBase):
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Query error at position 29. Expecting \*, all, single_quote_str, double_quote_str or \('):
+                'Query error at position 29. Expecting \*, all, '
+                'single_quote_str, double_quote_str or \('):
             await self.client0.query(
                 'list series /.*/ - {}{}'.format('(' * 10, ')' * 10))
 
         with self.assertRaisesRegex(
                 QueryError,
                 'Memory allocation error or maximum recursion depth reached.'):
-            await self.client0.query(
-                'list series /.*/ - {}/linux.*/{}'.format('(' * 200, ')' * 200))
+            await self.client0.query('''
+                list series /.*/ -
+                    {}/linux.*/{}'''.format('(' * 200, ')' * 200))
 
         await self.client0.query('alter database set list_limit 5000')
         with self.assertRaisesRegex(